Initial new packaging

diff --git a/debian/changelog b/debian/changelog
index 0611d2766ca6e34571c677089989c39c3038b538..858f156b8085c6cc9d549ddb5d82a7a1cd3109f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+opencc (1.1.1-1~exp1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release 1.1.1.
+  * debian/:
+    + Rename binary package names since upstream broke ABI
+      compatibility and bumped SONAME from 2 to 1.1.
+    + Add Breaks/Replaces relationship against older packages.
+
+ -- Boyuan Yang <byang@debian.org>  Sat, 23 May 2020 07:34:22 +0800
+
 opencc (1.0.6-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/debian/control b/debian/control
index 16b84b04780140b347bd7ccf9d129e5e5ef16673..dde6e78471d7e19ca38dcd4100fff98978fc27c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Section: libdevel
 Architecture: any
 Depends:
  libjs-jquery,
- libopencc2 (= ${binary:Version}),
+ libopencc1.1 (= ${binary:Version}),
  ${misc:Depends},
 Description: simplified-traditional Chinese conversion library - development
  opencc is a library for converting character between traditional Chinese and
@@ -36,35 +36,39 @@ Description: simplified-traditional Chinese conversion library - development
  .
  This package includes the development support files.
 
-Package: libopencc2
+Package: libopencc1.1
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libopencc2-data,
+ libopencc1.1-data,
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
- libopencc2-data (<< 1.0.4-5~),
+ libopencc2-data,
+ libopencc2,
 Replaces:
- libopencc2-data (<< 1.0.4-5~),
+ libopencc2-data,
+ libopencc2,
 Description: simplified-traditional Chinese conversion library - runtime
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.
  .
  This package includes the shared library.
 
-Package: libopencc2-data
+Package: libopencc1.1-data
 Architecture: all
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Breaks:
- libopencc-dev (<< 1.0.4-5~),
- libopencc2 (<< 1.0.4-5~),
+ libopencc-dev (<< 1.1.1~),
+ libopencc2,
+ libopencc2-data,
 Replaces:
- libopencc-dev (<< 1.0.4-5~),
- libopencc2 (<< 1.0.4-5~),
+ libopencc-dev (<< 1.1.1~),
+ libopencc2,
+ libopencc2-data,
 Description: simplified-traditional Chinese conversion library - data files
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.
@@ -76,7 +80,7 @@ Section: utils
 Architecture: any
 Multi-Arch: foreign
 Depends:
- libopencc2 (= ${binary:Version}),
+ libopencc1.1 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: simplified-traditional Chinese conversion tool

diff --git a/debian/libopencc1.1-data.install b/debian/libopencc1.1-data.install
new file mode 100644 (file)
index 0000000..759378e
--- /dev/null
+++ b/debian/libopencc1.1-data.install
@@ -0,0 +1,2 @@
+usr/share/opencc/*.json
+usr/share/opencc/doc/*

diff --git a/debian/libopencc1.1.install b/debian/libopencc1.1.install
new file mode 100644 (file)
index 0000000..4e01c53
--- /dev/null
+++ b/debian/libopencc1.1.install
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/share/opencc/*.ocd

diff --git a/debian/libopencc1.1.shlibs b/debian/libopencc1.1.shlibs
new file mode 100644 (file)
index 0000000..385d9de
--- /dev/null
+++ b/debian/libopencc1.1.shlibs
@@ -0,0 +1 @@
+libopencc 1.1 libopencc1.1 (>= 1.1.1~)

diff --git a/debian/libopencc2-data.install b/debian/libopencc2-data.install
deleted file mode 100644 (file)
index 759378e..0000000
--- a/debian/libopencc2-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/opencc/*.json
-usr/share/opencc/doc/*

diff --git a/debian/libopencc2.install b/debian/libopencc2.install
deleted file mode 100644 (file)
index 4e01c53..0000000
--- a/debian/libopencc2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/lib*.so.*
-usr/share/opencc/*.ocd

diff --git a/debian/libopencc2.shlibs b/debian/libopencc2.shlibs
deleted file mode 100644 (file)
index f905090..0000000
--- a/debian/libopencc2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libopencc 2 libopencc2 (>= 1.0.6)

diff --git a/debian/patches/lib-name-match-soversion.patch b/debian/patches/lib-name-match-soversion.patch
deleted file mode 100644 (file)
index cd3bed4..0000000
--- a/debian/patches/lib-name-match-soversion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 9 Oct 2017 22:02:39 +0800
-Subject: make sure library name matches soname
-
-===================================================================
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 234dc85..3e6759a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,7 +75,7 @@ set_target_properties(
-     OUTPUT_NAME
-       opencc
-     VERSION
--      1.0.0
-+      2.0.0
-     SOVERSION
-       2
- )

diff --git a/debian/patches/series b/debian/patches/series
index a39058bdbe3d06c3e11b68298ebcf9080c5fcdaa..0bdecb3883b08106afa2e2f15eef2f2c33e5b1bc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-lib-name-match-soversion.patch
 use-system-libraries.patch
 use-cmake-install-libdir.patch
 0004-data-Explicitly-use-python3.patch

diff --git a/debian/rules b/debian/rules
index 86fe1712db920370c69d88dc2487be11cbf6ae3b..2dc8806d6b306dd0bfbe76ca65378dccac3f9339 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,3 @@ override_dh_auto_clean:
 
 override_dh_installchangelogs:
        dh_installchangelogs -k NEWS.md
-
-override_dh_missing:
-       dh_missing --fail-missing